Merge.
authoradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Tue, 23 Aug 2005 19:03:21 +0000 (12:03 -0700)
committeradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Tue, 23 Aug 2005 19:03:21 +0000 (12:03 -0700)
1  2 
xen/arch/x86/vmx.c

Simple merge